[cherry-pick] Optimize async save #8878
+131
−91
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.